Fix path cleanup in multiple places (#3871) #3873
+17
−7
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.